Updating class names for consistency. Adding some base styles.