Added settings page
Added error checking and notification
Added a cancel button and fixed error dismissal
Merge branch 'profile'