Fixed Viewing options
merge commit