Cleaned up more UI stuff