JSOLR-140. Includes some layout cleanup as well.