fix margins and fix https://github.com/nens/lizard-nxt/issues/404

Does https://github.com/nens/lizard-nxt/issues/404