More markup and styles fixes.