Fix the layout problem reported by @md-5