Remove/refactor more UI crud
Refactored out the remaining 'temporary' crud in main.js
Refactored settings