More work on preview area