WIP
Progress
add page active helper