reorganized routes and controllers
Patched sidebar options overlapping