Fix/responsive issues