Layout adjustments added