Done again as navigation drawer wasn't closing when it was supposed to
This reverts commit 35e4717740.
35e4717740