fix shortcuts on toolbar and make outside margin universal.