fixing duplicate shortcut, new margin area
Merge pull request #1495 from diegosarmentero/master

fixing duplicate shortcut, new margin area