Refactor monitoring package + fix monitoring page