Added nicer UI