Cleanup. Added page transitions.
Merge branch 'develop'