Layout : Added wrap content option