Changes the way margin settings are handled. Fixes keyboard navigation issues