refactoring

moving some html around;