Make the drawer a bit more beautiful.
Fix 2 race conditions.