Misc fixes

Some fixes for the preview page