Updated to clean up the layout