final commit before merge of responsive code