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