Made some ui adjustments to unify changes