Made no-arrow layout work