Reworked & simplified storage, fixed issues with admin pages.