Fix numerous UI issue