redesign step and step and step
Merge branch 'liberation' of github.com:palasthotel/grid into liberation