Remove redundent function.
More cleanup.
More fixes.
More fixes.
Merge pull request #3049 from openscholar/subtheme-fix

Provide better UI for Subtheme