Clean up layouts, add documentation