Updates to styles and more model validation

Updates to styles and more model validation