[FIX] Fixes on wizard and views