Fixed some HTML and small Bugs