Fix color issue, fix bad view reference