Heavy refactor of settings page and removal of restangular