Working on admin menus
Re-shaping db models for better admin menus