Added more pages and features