Starting  to create a better UI