Ui fixes

minor ui fixes, phase 1