Improve drawer and fragment handling