Improved client side validation
Cleaned up a lot of crap in Admin