More resp. design fixes