Tofe/work: UI and settings fixes