moved question type highlights, moved choice buttons after dropdown caret