Merge pull request #248 from theponti/development

Development
Merge pull request #250 from theponti/development

Development
Fixes #251
Merge pull request #252 from theponti/feature/dropdown-nav

Fixes #251