Extended Customer Model, some UI changes for new needs