Fixed some preview stopping errors, minor display tweaks