Fix Responsive bugs