Mostly grammar changes, fixed active page problem