Added adaptive & responsive features