layout almost complete
Merge branch 'frontend'