Fix CSS? And small edits