View one user fix.
Minor design and header code alignment changes