Fix typo and invalid html
Cleanup main layout