Added better responsive features