Minor fixes to implement shortcut view controller