fixed table and added preview