Revert "margin 5px added, px to padding"

This reverts commit 8c4175f7a9338519ef98654e9d7df7f969047f41.