Fixed the buggy ui components.