Fix broken merge. Fix small CSS issues.