code cleanup
Merge branch 'enh2'
mall cleanup to display pages better