Small fixes (Layout issues)
(cherry picked from commit 5253d7e)
(cherry picked from commit 0849941)