Visual tweaks and refactoring for lighter pageload.