Changed UI to be a bit more efficient.