fixed some ui bugs
removed abort in bad scenarios