FIX: TopView updating