Added some layouts and formatting changes