Modified a few more UI things