Feature/responsive fixes