Added many more pages and features