Show admin buttons on all settings pages
Fix for settings not working from instance
Merge remote branch 'carschroeder/admin-buttons-on-all-setting-pages' into develop