Updated small UI bug fixes