FIXED: Massive bug fixes in the admin view
FIXED: Massive bug fixes to the front end