Refactor out drawer logic from activity