Made slight modification to the layout