Add WordCleaner, fix layout