slight layout improvements