Top margin fix for all cases, stash showing, stash hidden, and no stash. fixes #411