Added uniqueness validation and some styling fixes