Further adjustments to layout - working fine.