major changes to ui