Various updates and layout fixes.