cleaned up controllers, add user js file, pulled cs into file