Fixing html & tweaking spacing