fixed short and margin titles
Merge branch 'short' of https://github.com/BitShares/web_wallet into short