ticket:3 Data validation, data saving; minor layout change