CSS cleanup closes #916