More drawer tweaks!