Added TODO
Major simplification of site layout