Cleanup; active and round borders