Fixed more UI issues