remove message from most pages, more sane markup in general