Fixed Layout

Working for > 1020