fix wrong margins being used
interface update 1
various small layout fixes