Merge "Fix Drawer selection and initial Header"