Fixed wrapping and added class