Improve UI slightly
Better deleted route handling

Though not perfect yet