with minor visual and action fixes