Moved JS code around
Modified category and novice wizard for new theme