Changed some html code for better view