Made the layout code prettier