Made some improvements in the UI