Fix UI issue for default theme