Rearrange css and start moving back to % sizing/positioning