Refactored forms, routes and controllers, fixed issues