Changes for a better UI!