tidied up pages and transitions