Modified pages to handle routes