Code refactoring

- Refactored for the 2nd sidebar
- The 2nd sidebar will be available soon :-)