Seperated controllers
Major layout changes