PageModule: category removed
New QrModule
UserForm -> UserControl
typos, spaces, cleanup