Entities, Forms and display fixes