ShellViewModel and other minor changes