More drawer tweaks