Several updates to massaging view