Update layouts, clear out boilerplate