UI and refac