Fixed the layout bug