added some more UI changes