Changed template classnames and added actions