admin buttons + form enhancements