Controllers, cleaned up routes, added form