Added small UI fixes