UI stuff, fixes for route system