Fixing the styles and html markup