Reverts "Small html fixes" and fixes #12

This reverts commit af802e336c16ba9b8a057f5a110b30fa45e28c0a.

Conflicts:
	templates/default.php