first version of cleaning up the site view #514
yep, we don't need to wait 8 seconds anymore