Updated Header and made a few fixes to the Views