small changes to ui
fixed merge conflicts