Cleaner merge of HTML & PHP

moved HTML out of PHP tags, vice versa