Pages, refactored routes
Specs etc.
Settings refactoring, removing redundant stuff