UI improvements made