Fix some html issues

This fixes all html issues which are not related to angularJS.

See #990