Added a new lab page
Some refactorings