Other ui cleanup + bug fix