Reworked on rwd/fix some problem in the layout