Fixed some issues with closing html tags