fixes in responsible design
changes in options accordion
conflict fix