Fixing for styling and better markup