Revamp cheat-sheet
Merge pull request #2035 from notdryft/cheatsheet-layout

Revamp cheat-sheet