Fixed a few view issues