Small fix (Layout issue)
(cherry picked from commit a98ade4)
(cherry picked from commit 147bbac)