Did some improvements on the UI