Force render buttons feature, bug fixes