Fixing some views. Still requires checking and a lot of cleanup