new layout
Finished new layout