Fixed bug. Simplified wrap view.