improve action on drawer