Updated App to reflect service and fixed bugs

Fixed LOTS of bugs. All working except for insert to service.