Issue #33: Some layout improvements for the drawer