Fixed some more UI bugs