Layout changes

Basic changes to layout.