Adding wrap feature and status/source information on analysis view