Minor Changes to the layout