Adding fixes for default drawer