Responsive + bug fixing