Refactoring: Use echo statements to output HTML

Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
Merge pull request #1072 from kb-yashodha/refactoring

Refactoring: Use echo statements to output HTML