Made the layout cleaner