Cleanup
moved content of pagehelper and navigationhelper to theme