Some fixes for responsive