Uses html for options rather than angular, updates ionicons
Adds tracking confirmation and login page
Fixing some merge conflicts