Refine UI and some views