Made a few UI improvements