Added rendering for all types of buttons