Cleanup angular code. Make one angular app, use a service and separate controllers