Add Right drawer fixes #1