Small fixes ( layout )
(cherry picked from commit 3a01426)