Minor Fixes of UI