Improved The Preivew page

A lot of changes