more formatting, should be wordpress code style now
moved html into individual files