Quick and Dirty fix for choice viewing