More changes to ui