Changed some ui components