Clean up layout and broke down controllers to seperate files