UI Changes. (Thanks to @emsquared for contribution)