more drawer fixes