Update new index, menu page and bug fixes