Omniture, added page tracking and some refactoring