Phase 2 - changes

Resolved - forward page issue and code clean up