Add admin menu
Separation of functions
Separation of functions 2