better layout, added new fields