Fixes to suggestions (routes order that caused conflicts), layout fix