pojos parsing and ui improvements