Fixing visuals and views