new controllers, new layout
notifications
cleaning up