Added specs, modified views