borderless done button + little fixes