Changes preview / JS Handling / Bug fixing