First implem of responsive support #98