GUI and Routes adjustments