Add better responsive support