Added bugfix for admin save reported by dvac, and checked into r2 branch
Complete redesign. Added reminders