works on surf form
fixes dummy data dup entries
Switches routing to ui-router, removes some other deprecated components