Improvement on responsive version