Removing unused views, renaming used one
Adding validations that I will likely remove later