More visual refresh
Finishing up visual refresh