Feature/responsive fix