Moved drawer functionality to base class