Fixed drawer navigation logic