Added a few changes for the layout