Small ui adjustments and bug fix