Moves one of the controllers that was improperly in the service file into the controller file
Changes the layout of the nav buttons to be using bootstrap pillboxes
Changes the layout of the services file to match the other angular files.
Adds comments to help with clarity.