Added li to ul to comply with W3C
Fixing other syntax problems