Major changes to UI and templates