JS & CSS cleanup and conflict resolution