Merge pull request #419 from codingtwinky/master

Using tooltip for ignore and discard button. fix #405
Reverting previous corrections for top margin
Adding app-top-margin buffer #412