Changing layout again

Also moving to PhotoShop to iron out some design changes.