Cleaned up routes
Added active record associations