Navigation fixes, removed test folder
Small viewmodel fixes