some page functionality reworking and clean up