Lots of changes to layout. Looking good