Minor maj css + js
Fix conflict