Changed some ui functionality