fix validation and styles;