Adding better UI