Added custom tags,UI Changes and validations