Markup and CSs fixes