Final View Fix