Preview window

Merge preview_window to master