Made a few changes to the layout. Need to figure out a good design