modularized and removed preview pane