Added a layout and cleaned up formatting