Fixed some view issues