fixed minor ui stuff
Merge branch 'fixes' into develop
ui chagnes