Improve Server - Client interaction and previewing