Layout

Styling needs fixing
Need new templates