Patch from Daniel Fernandes <dfernandes1978@hotmail.com> fixing a bit incorrect layou...