Fixed some issues with View Sample