Reorganized navigation drawer, various bugfixes