More projects, cleaning up layouts