Fixed controller actions and cleaned up html and js