Develop

New navigation drawer
Fixes #16 #21