Added some changes to get a better layout in .html file