Made a bunch of changes to layout