Minor tweaks + added additional pages