some model validation and layout improvements