Fix the layout issues xD