Removed admin section, restructuring edit mode