Scheduling

-bug fix
-new architecture for the admin part