made a lot of changes to layout