Markup and small css changes