Better implementation of drink selection, fixed a bug where current session is not cleared