Removes additional classes to reduce code. Also updates classes in css