Some minor fixes on the ui