Added better UI