remove border
some corrections in flow