Made use of controllers, better routing