Small fix ( layout issue )
(cherry picked from commit 9118d19)
(cherry picked from commit 552f4ff)