Tidy up controllers, add images