Few ui adjustments