New basic tests, updated navigation and shortcuts
Fix for #133 back button bug