Small fix ( layout issue )
(cherry picked from commit 949528d)
(cherry picked from commit b8a5622)