cleaning up everything: integration of the new layout is about to start