Changed UI to be better.