Change lite version to match style of 'full' version.
Fix bug when not using auto Q/A advance (both versions)