simplified layout and removed layout.html