Fix View Controllers