fixed views changes that got lost in merge, small