Cleanup: removed some unused files and aligned HTML
Some more cleanup