validations, design changed and other fixes