Sunday night fixes

- Removing the page parameter from all the places it doesn’t belong
- Trying to optimize menu rendering