Removed unnecessary wrapper from markup.
Updated datasource and objects.