Small UI tweaks and template refactor.