- Changed drawer to use expandable lists