Break up layout into partials
Add debug information to layout