Some clean up & slight modification of the layout