Some preview imporvements