Minor fixes and layout adjustments.