Improving UI in Entity Model Form