Changed UI for the better