Fixed problems with HTML tags being used in names | Changed some CSS