Restructured code

Fixed account information not being laid out correctly
Fixed track button showing up still when an error has occurred
Included new service and controller files